Remove leftover ZEND_CAST code for (unset) cast. #5042
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nikic
approved these changes
Jan 2, 2020
| @@ -5730,12 +5730,6 @@ ZEND_VM_COLD_CONST_HANDLER(51, ZEND_CAST, CONST|TMP|VAR|CV, ANY, TYPE) | |||
| expr = GET_OP1_ZVAL_PTR(BP_VAR_R); | |||
|
|
|||
| switch (opline->extended_value) { | |||
There was a problem hiding this comment.
Please add an assert along the lines of ZEND_ASSERT(opline->extended_value != _IS_BOOL && "Must use ZEND_BOOL instead"); here.
There was a problem hiding this comment.
The ZEND_ASSERT(opline->extended_value == IS_OBJECT); I added would also fail for that same assertion, just later in the program execution. There weren't any early returns I saw.
Added anyway to default:
ext/opcache/Optimizer/dce.c
Outdated
| @@ -106,6 +106,7 @@ static inline zend_bool may_have_side_effects( | |||
| case ZEND_IS_SMALLER: | |||
| case ZEND_IS_SMALLER_OR_EQUAL: | |||
| case ZEND_CASE: | |||
| /* TODO: Can ZEND_CAST throw when converting object to array (in custom handlers for zend_get_properties_for?) */ | |||
There was a problem hiding this comment.
I'd say yes. Throwing is not handled by this function though, but by zend_may_throw.
| @@ -4630,8 +4605,9 @@ int zend_may_throw(const zend_op *opline, const zend_op_array *op_array, zend_ss | |||
| case IS_ARRAY: | |||
| return (t1 & MAY_BE_OBJECT); | |||
| case IS_OBJECT: | |||
| return (t1 & MAY_BE_ARRAY); | |||
| return 0; | |||
| default: | |||
There was a problem hiding this comment.
Replace with EMPTY_SWITCH_DEFAULT_CASE().
Followup for d74d392 Attempting to require a file with (unset) casts results in an E_COMPILE_ERROR that can't be caught or handled by set_exception_handler/set_error_handler. Also remove the (bool) cast, because the ZEND_BOOL opcode handles that. Remove inference that array -> object cast can throw. It was added in 2a286ad - I don't know how creating an stdClass would throw. (numeric keys, references, etc. don't cause it to throw)
TysonAndre
force-pushed
the
unset-cast-cleanup
branch
from
2a6f936 to
2903737
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Followup for d74d392
Attempting to require a file with (unset) casts results in an E_COMPILE_ERROR
that can't be caught or handled by set_exception_handler/set_error_handler.
Also remove the
_IS_BOOLhandlers, because the ZEND_BOOL opcode handles that (emitted by zend_compile.c).Remove inference that array -> object cast can throw.
It was added in 2a286ad - I don't know how creating an stdClass would throw.
(numeric keys, references, etc. don't cause it to throw, and out of memory would be a fatal error)
$x = (object)$x. (ZEND_CAST then ZEND_ASSIGN).